Add Array<int> to options, additional limiters for grids (rebase) #2767
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Enable 1D arrays of integers to be read from NetCDF files, and made available via `Mesh::get()`. Mainly useful for mesh construction.
When reading 1D vector of ints, check that the input is long enough, and resize the output vector.
A short-term fix, allowing extra limiters to be added with inputs: limiter_count : int limiter_yinds : [int], length limiter_count limiter_xstarts : [int], length limiter_count limiter_xends : [int], length limiter_count The limiter(s) are added between yinds[i] and yinds[i] + 1
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| // Ensure that output variable has the correct size | ||
| var.resize(len); | ||
|
|
||
| const auto* it = std::begin(full_var); |
There was a problem hiding this comment.
warning: variable name 'it' is too short, expected at least 3 characters [readability-identifier-length]
const auto* it = std::begin(full_var);
^| int limiter_count = 0; | ||
| Mesh::get(limiter_count, "limiter_count", 0); | ||
| if (limiter_count > 0) { | ||
| std::vector<int> limiter_yinds, limiter_xstarts, limiter_xends; |
There was a problem hiding this comment.
warning: multiple declarations in a single statement reduces readability [readability-isolate-declaration]
Suggested change
| std::vector<int> limiter_yinds, limiter_xstarts, limiter_xends; | |
| std::vector<int> limiter_yinds; | |
| std::vector<int> limiter_xstarts; | |
| std::vector<int> limiter_xends; |
| } | ||
|
|
||
| for (int i = 0; i < limiter_count; ++i) { | ||
| int yind = limiter_yinds[i]; |
There was a problem hiding this comment.
warning: variable 'yind' of type 'int' can be declared 'const' [misc-const-correctness]
Suggested change
| int yind = limiter_yinds[i]; | |
| int const yind = limiter_yinds[i]; |
|
|
||
| for (int i = 0; i < limiter_count; ++i) { | ||
| int yind = limiter_yinds[i]; | ||
| int xstart = limiter_xstarts[i]; |
There was a problem hiding this comment.
warning: variable 'xstart' of type 'int' can be declared 'const' [misc-const-correctness]
Suggested change
| int xstart = limiter_xstarts[i]; | |
| int const xstart = limiter_xstarts[i]; |
| for (int i = 0; i < limiter_count; ++i) { | ||
| int yind = limiter_yinds[i]; | ||
| int xstart = limiter_xstarts[i]; | ||
| int xend = limiter_xends[i]; |
There was a problem hiding this comment.
warning: variable 'xend' of type 'int' can be declared 'const' [misc-const-correctness]
Suggested change
| int xend = limiter_xends[i]; | |
| int const xend = limiter_xends[i]; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebase of #2721 on
nextThe reason this was added is to be able to include additional limiters in the input file. The format is a short-term solution only, though these have a habit of becoming permanent.